sizegroup: Fold function into only caller
authorBenjamin Otte <otte@redhat.com>
Tue, 15 Sep 2015 20:08:55 +0000 (22:08 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 28 Oct 2015 18:44:27 +0000 (19:44 +0100)
gtk/gtksizegroup.c

index 84a0ee930f6363990db4e1f5c252543dfe3f906e..8732beb9eaabbcd0835c31b28b636960c8c90bca 100644 (file)
@@ -203,33 +203,6 @@ _gtk_size_group_get_widget_peers (GtkWidget      *for_widget,
   return widgets;
 }
 
-static void
-gtk_container_queue_resize (GtkContainer *container)
-{
-  GtkWidget *widget;
-
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-
-  widget = GTK_WIDGET (container);
-
-  do
-    {
-      _gtk_widget_set_alloc_needed (widget, TRUE);
-      _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
-
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      if (GTK_IS_RESIZE_CONTAINER (widget))
-        break;
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-
-      widget = gtk_widget_get_parent (widget);
-    }
-  while (widget);
-
-  if (widget)
-    gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
-}
-
 static void
 real_queue_resize (GtkWidget *widget)
 {
@@ -245,7 +218,24 @@ real_queue_resize (GtkWidget *widget)
 
   if (container)
     {
-      gtk_container_queue_resize (GTK_CONTAINER (container));
+      widget = container;
+
+      do
+        {
+          _gtk_widget_set_alloc_needed (widget, TRUE);
+          _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
+
+          G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+          if (GTK_IS_RESIZE_CONTAINER (widget))
+            break;
+          G_GNUC_END_IGNORE_DEPRECATIONS;
+
+          widget = gtk_widget_get_parent (widget);
+        }
+      while (widget);
+
+      if (widget)
+        gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
     }
 }